Merge branch 'master' into master
authorskeleten <skeleten@users.noreply.github.com>
Wed, 29 Jun 2016 00:09:02 +0000 (02:09 +0200)
committerGitHub <noreply@github.com>
Wed, 29 Jun 2016 00:09:02 +0000 (02:09 +0200)

Trivial merge